From 10443a8747d16b3aa809bcb78854435c2320a46e Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 12 Nov 2014 16:05:33 -0800
Subject: [PATCH] Pin rustc to a date with known snapshots

I don't really expect all builders of cargo to be forced to use this rustc, and
I expect this to update frequently, but it will allow cargo PRs to land without
forcing a "put out the fires" fix for all nightly incompatibilities all at once.
This will allow rust upgrades to land separately and be reviewed separately.
---
 .travis.install.deps.sh                  | 8 ++++----
 src/rustversion.txt                      | 1 +
 tests/test_cargo_compile_custom_build.rs | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 src/rustversion.txt

diff --git a/.travis.install.deps.sh b/.travis.install.deps.sh
index c8396e394..758912791 100755
--- a/.travis.install.deps.sh
+++ b/.travis.install.deps.sh
@@ -17,15 +17,15 @@ if [ "${TRAVIS}" = "true" ] && [ "${target}" = "unknown-linux-gnu" ]; then
     sudo apt-get install g++-multilib lib32stdc++6
 fi
 
-host=static-rust-lang-org.s3.amazonaws.com
+url=https://static-rust-lang-org.s3.amazonaws.com/dist/`cat src/rustversion.txt`
 
 # Install both 64 and 32 bit libraries. Apparently travis barfs if you try to
 # just install the right ones? This should enable cross compilation in the
 # future anyway.
 if [ -z "${windows}" ]; then
     rm -rf rustc *.tar.gz
-    curl -O https://$host/dist/rust-nightly-i686-$target.tar.gz
-    curl -O https://$host/dist/rust-nightly-x86_64-$target.tar.gz
+    curl -O $url/rust-nightly-i686-$target.tar.gz
+    curl -O $url/rust-nightly-x86_64-$target.tar.gz
     tar xfz rust-nightly-i686-$target.tar.gz
     tar xfz rust-nightly-x86_64-$target.tar.gz
 
@@ -54,7 +54,7 @@ else
     else
         triple=i686-pc-windows-gnu
     fi
-    curl -O http://$host/dist/rust-nightly-$triple.exe
+    curl -O $url/rust-nightly-$triple.exe
     innounp -y -x rust-nightly-$triple.exe
     mv '{app}' rustc
     # Don't use the bundled gcc, see rust-lang/rust#17442
diff --git a/src/rustversion.txt b/src/rustversion.txt
new file mode 100644
index 000000000..0a44487ba
--- /dev/null
+++ b/src/rustversion.txt
@@ -0,0 +1 @@
+2014-11-11
diff --git a/tests/test_cargo_compile_custom_build.rs b/tests/test_cargo_compile_custom_build.rs
index e11dfa6f1..17c26b3c4 100644
--- a/tests/test_cargo_compile_custom_build.rs
+++ b/tests/test_cargo_compile_custom_build.rs
@@ -781,6 +781,7 @@ test!(output_separate_lines {
 ", compiling = COMPILING, running = RUNNING).as_slice()));
 })
 
+#[cfg(not(windows))] // FIXME(#867)
 test!(code_generation {
     let p = project("foo")
         .file("Cargo.toml", r#"
-- 
2.30.2